From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Sun, 14 Mar 2010 21:56:41 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8380^2~1
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5f51a8cd360cda2ca7391c43bfd504d67fe64b3f;p=emacs.git

Merge from mainline.
---

5f51a8cd360cda2ca7391c43bfd504d67fe64b3f